From 6320ce95b9c2de58f2bb28639ae2ef4b6e37c728 Mon Sep 17 00:00:00 2001
From: Vijaya Kumar K <Vijaya.Kumar@caviumnetworks.com>
Date: Thu, 26 Jun 2014 11:03:53 +0530
Subject: [PATCH] xen/arm: move io.h as mmio.h to include folder

io.h is local to arch/arm folder. move this file as mmio.h
file to include/asm-arm folder as it might be
required for inclusion in other header files in future.

Signed-off-by: Vijaya Kumar K <Vijaya.Kumar@caviumnetworks.com>
Acked-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
 xen/arch/arm/io.c                             | 3 +--
 xen/arch/arm/traps.c                          | 2 +-
 xen/arch/arm/vgic.c                           | 2 +-
 xen/arch/arm/vuart.c                          | 2 +-
 xen/{arch/arm/io.h => include/asm-arm/mmio.h} | 8 ++++----
 5 files changed, 8 insertions(+), 9 deletions(-)
 rename xen/{arch/arm/io.h => include/asm-arm/mmio.h} (91%)

diff --git a/xen/arch/arm/io.c b/xen/arch/arm/io.c
index a6db00b30e..ada191819e 100644
--- a/xen/arch/arm/io.c
+++ b/xen/arch/arm/io.c
@@ -19,8 +19,7 @@
 #include <xen/config.h>
 #include <xen/lib.h>
 #include <asm/current.h>
-
-#include "io.h"
+#include <asm/mmio.h>
 
 static const struct mmio_handler *const mmio_handlers[] =
 {
diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index 2fde0dd5ef..686d8b7996 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -36,9 +36,9 @@
 #include <asm/regs.h>
 #include <asm/cpregs.h>
 #include <asm/psci.h>
+#include <asm/mmio.h>
 
 #include "decode.h"
-#include "io.h"
 #include "vtimer.h"
 #include <asm/gic.h>
 
diff --git a/xen/arch/arm/vgic.c b/xen/arch/arm/vgic.c
index 757707eb3f..155aed8d71 100644
--- a/xen/arch/arm/vgic.c
+++ b/xen/arch/arm/vgic.c
@@ -27,7 +27,7 @@
 
 #include <asm/current.h>
 
-#include "io.h"
+#include <asm/mmio.h>
 #include <asm/gic.h>
 
 #define REG(n) (n/4)
diff --git a/xen/arch/arm/vuart.c b/xen/arch/arm/vuart.c
index c02a8a9c86..953cd464e4 100644
--- a/xen/arch/arm/vuart.c
+++ b/xen/arch/arm/vuart.c
@@ -38,9 +38,9 @@
 #include <xen/errno.h>
 #include <xen/ctype.h>
 #include <xen/serial.h>
+#include <asm/mmio.h>
 
 #include "vuart.h"
-#include "io.h"
 
 #define domain_has_vuart(d) ((d)->arch.vuart.info != NULL)
 
diff --git a/xen/arch/arm/io.h b/xen/include/asm-arm/mmio.h
similarity index 91%
rename from xen/arch/arm/io.h
rename to xen/include/asm-arm/mmio.h
index 8d252c06a3..587098565c 100644
--- a/xen/arch/arm/io.h
+++ b/xen/include/asm-arm/mmio.h
@@ -1,5 +1,5 @@
 /*
- * xen/arch/arm/io.h
+ * xen/include/asm-arm/mmio.h
  *
  * ARM I/O handlers
  *
@@ -16,8 +16,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef __ARCH_ARM_IO_H__
-#define __ARCH_ARM_IO_H__
+#ifndef __ASM_ARM_MMIO_H__
+#define __ASM_ARM_MMIO_H__
 
 #include <xen/lib.h>
 #include <asm/processor.h>
@@ -45,7 +45,7 @@ extern const struct mmio_handler vuart_mmio_handler;
 
 extern int handle_mmio(mmio_info_t *info);
 
-#endif
+#endif  /* __ASM_ARM_MMIO_H__ */
 
 /*
  * Local variables:
-- 
2.30.2